From 8262a2910e821c6ec58569aa547c0cf261f8a619 Mon Sep 17 00:00:00 2001
From: Rodrigo Aguilera <hi@rodrigoaguilera.net>
Date: Sun, 15 Nov 2015 13:02:50 +0000
Subject: [PATCH] ARM: sun7i: Fix HDMI Audio driver's Alsa interface and do 8CH
 IEC60958 output

---
 drivers/video/sunxi/hdmi/drv_hdmi.c         |  2 +-
 sound/soc/sunxi/hdmiaudio/sndhdmi.c         | 10 ++++++----
 sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c | 11 ++++++-----
 sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c   |  8 +++++---
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/drivers/video/sunxi/hdmi/drv_hdmi.c b/drivers/video/sunxi/hdmi/drv_hdmi.c
index 283d2ae..9cf2cc2 100644
--- a/drivers/video/sunxi/hdmi/drv_hdmi.c
+++ b/drivers/video/sunxi/hdmi/drv_hdmi.c
@@ -314,7 +314,7 @@ __s32 Hdmi_init(struct platform_device *dev)
 	if (err)
 		return err;
 
-	audio_info.channel_num = 2;
+	audio_info.channel_num = 8;
 #if 0
 	{ /* for audio test */
 		hdmi_audio_t audio_para;
diff --git a/sound/soc/sunxi/hdmiaudio/sndhdmi.c b/sound/soc/sunxi/hdmiaudio/sndhdmi.c
index 1c306d2..d29cee2 100644
--- a/sound/soc/sunxi/hdmiaudio/sndhdmi.c
+++ b/sound/soc/sunxi/hdmiaudio/sndhdmi.c
@@ -85,7 +85,9 @@ static int sndhdmi_hw_params(struct snd_pcm_substream *substream,
 		return -EINVAL;
 	}
 
-	if (4 == hdmi_para.channel_num)
+        if (2 < hdmi_para.channel_num)
+		hdmi_para.channel_num = 8;
+	if (2 > hdmi_para.channel_num)
 		hdmi_para.channel_num = 2;
 
 	g_hdmi_func.hdmi_set_audio_para(&hdmi_para);
@@ -129,11 +131,11 @@ struct snd_soc_dai_ops sndhdmi_dai_ops = {
 /* codec dai */
 struct snd_soc_dai_driver sndhdmi_dai = {
 	.name = "sndhdmi",
-	/* playback capabilities */
+	/* playback capabilities, hdmi_core::audio_config() claims 8ch cap */
 	.playback = {
 		.stream_name = "Playback",
-		.channels_min = 1,
-		.channels_max = 2,
+		.channels_min = 2,
+		.channels_max = 8,
 		.rates = SNDHDMI_RATES,
 		.formats = SNDHDMI_FORMATS,
 	},
diff --git a/sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c b/sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c
index 12da1a6..bd639c0 100644
--- a/sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c
+++ b/sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c
@@ -34,8 +34,9 @@
 #include <plat/sys_config.h>
 #include <plat/dma_compat.h>
 
-static struct sunxi_dma_params sunxi_hdmiaudio_pcm_stereo_out = {
-	.client.name	=	"HDMIAUDIO PCM Stereo out",
+static struct sunxi_dma_params sunxi_hdmiaudio_pcm_iec60958_out = {
+	.client.name	=	"HDMIAUDIO PCM IEC60958 out",
+
 #if defined CONFIG_ARCH_SUN4I || defined CONFIG_ARCH_SUN5I
 	.channel	=	DMACH_HDMIAUDIO,
 #endif
@@ -67,7 +68,7 @@ static int sunxi_hdmiaudio_hw_params(struct snd_pcm_substream *substream,
 	rtd = substream->private_data;
 
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-		dma_data = &sunxi_hdmiaudio_pcm_stereo_out;
+               dma_data = &sunxi_hdmiaudio_pcm_iec60958_out;
 	else
 		printk("error:hdmiaudio can't support capture:%s,line:%d\n",
 							__func__, __LINE__);
@@ -182,8 +183,8 @@ static struct snd_soc_dai_driver sunxi_hdmiaudio_dai = {
 	.resume			= sunxi_hdmiaudio_resume,
 	.remove			= sunxi_hdmiaudio_dai_remove,
 	.playback		= {
-		.channels_min	= 1,
-		.channels_max	= 2,
+		.channels_min	= 2,
+		.channels_max	= 8,
 		.rates		= SUNXI_HDMI_RATES,
 		.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE,
 	},
diff --git a/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c b/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c
index 4916b51..3266061 100644
--- a/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c
+++ b/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c
@@ -45,8 +45,8 @@ static const struct snd_pcm_hardware sunxi_pcm_hardware = {
 					SNDRV_PCM_RATE_KNOT,
 	.rate_min		= 8000,
 	.rate_max		= 192000,
-	.channels_min		= 1,
-	.channels_max		= 2,
+	.channels_min		= 2,
+	.channels_max		= 8,
 	.buffer_bytes_max	= 128*1024, /* value must be (2^n)Kbyte size */
 	.period_bytes_min	= 1024*4,
 	.period_bytes_max	= 1024*32,
@@ -347,7 +347,7 @@ static void sunxi_pcm_free_dma_buffers(struct snd_pcm *pcm)
 	struct snd_dma_buffer *buf;
 	struct snd_pcm_substream *substream;
 
-	for (stream = 0; stream < 2; stream++) {
+	for (stream = 0; stream < 8; stream++) {
 		substream = pcm->streams[stream].substream;
 		if (!substream)
 			continue;
@@ -375,6 +375,8 @@ static int sunxi_pcm_new(struct snd_soc_pcm_runtime *rtd)
 	if (!card->dev->coherent_dma_mask)
 		card->dev->coherent_dma_mask = 0xffffffff;
 
+	strcpy(rtd->pcm->name, "sunxi HDMI PCM");
+
 	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
 		ret = sunxi_pcm_preallocate_dma_buffer(pcm,
 			SNDRV_PCM_STREAM_PLAYBACK);
-- 
1.9.1

